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