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