Merge "[automerger skipped] Merge "Fix a race condition in ZenModeTest" into pie-cts-dev am: 561816be24 -s ours am skip reason: Change-Id I69f31275ecb44fe05f9c1cd0c8d5b3eab5a3fd4b with SHA-1 9c55395721 is in history" into android10-tests-dev