Merge "Fix robotests failure in connectivity settings" into rvc-qpr-dev am: 07bb0280 am: a75273fe

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13298728

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia17fe2db37d0258b9e3a8a09dce8d148f6ee12be