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