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