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