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