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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia942e29d02f120905558779723fdb4a7b00117f5