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