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