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