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