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