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