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