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