Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14935382 Change-Id: I081e690c3d3afd1bd0e73d2869172d229863baef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14935382 Change-Id: I081e690c3d3afd1bd0e73d2869172d229863baef