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

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

Change-Id: I967f4c441ba2bce676c6a5716117a4b58bc2c80e