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