[automerger skipped] Merge "Avoid mixups between different CPSes in...

[automerger skipped] Merge "Avoid mixups between different CPSes in ZenModeConditions" into tm-qpr-dev am: 810d2f34 -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: I2feef7a349f34435cb46780effaf7560617aba9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>