Merge "Support waiting for surfaceflinger service to stop before test starts" into android11-tests-dev