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