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