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