[automerger skipped] Avoid mixups between different CPSes in ZenModeConditions...

[automerger skipped] Avoid mixups between different CPSes in ZenModeConditions am: 2139fecd -s ours am: d5edab9f -s ours am: 556d70a7 -s ours am: 5eeaed8c -s ours

am skip reason: Merged-In I7bff4b04674b5f247bd3b8b6920af029ef8098f5 with SHA-1 bf796a73 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/33983951



Change-Id: I8c27970230c6cf1e114f0d4765eccb489a892d16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>