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