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