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