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

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

Change-Id: Ia70111ed021dc7f52dedd7f9f3c9b0530802a996