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