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

[automerger skipped] Merge "Avoid mixups between different CPSes in ZenModeConditions" into udc-dev am: 51d70140 am: 55f00a5a -s ours am: b7fc1d41 -s ours

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

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



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