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