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