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