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