[automerger skipped] Merge "Support waiting for surfaceflinger service to stop...

[automerger skipped] Merge "Support waiting for surfaceflinger service to stop before test starts" into android11-tests-dev am: 34fb8d96 -s ours

am skip reason: skipped by user dshi

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1557668

Change-Id: I1bd6360bcb29c32c0ac49fabe95c22f067af08ea