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

[automerger skipped] Avoid mixups between different CPSes in ZenModeConditions am: efdc2b0c -s ours

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

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



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