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