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