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