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