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