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