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