Merge "Support waiting for surfaceflinger service to stop before test starts" am: 1d8b9fc0b7

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

Change-Id: Id416ca6960f6acddd34a3e4e2bfe2da8b19544b5