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