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