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