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