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