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