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