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