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

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