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