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