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