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