[automerger skipped] Merge "Use same steps to test MBS connection as when...

[automerger skipped] Merge "Use same steps to test MBS connection as when actually connecting" into rvc-qpr-dev am: 9746948a am: ad21e64f -s ours

am skip reason: Change-Id I68b3f98dbcc984822b737887c222be771093e9c6 with SHA-1 7d8b80e6 is in history

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

Change-Id: I25baf52754823ad7ddc3bf490752cfe8064b444d