Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1731234 Change-Id: I4cc9039afe6a397645f072593eaa4a0da765ee2f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1731234 Change-Id: I4cc9039afe6a397645f072593eaa4a0da765ee2f