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