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