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