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