Merge "[automerger skipped] Merge "Whitelist settings robotests to access wifi...

Merge "[automerger skipped] Merge "Whitelist settings robotests to access wifi impl details" into stage-aosp-master am: 841c88d8 -s ours am: 8b7da13b -s ours am: 0a92958b -s ours" into rvc-qpr-dev-plus-aosp am: 3874b253 -s ours

am skip reason: Change-Id Id283ecb2b9b8bd087028f9a68604adc516e9ea9e with SHA-1 f7c21629 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12508779

Change-Id: I052ce84d986b1b5ee29bca8954f1655c6962e1c5