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