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