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