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