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