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