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