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