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

[automerger skipped] Merge "Avoid mixups between different CPSes in ZenModeConditions" into tm-dev am: b8129578 am: 0f2fd692 -s ours am: 28814305 -s ours am: 072139c8 -s ours

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

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



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