[automerger skipped] Merge "[DO NOT MERGE] Fix conditionId string trimming in...

[automerger skipped] Merge "[DO NOT MERGE] Fix conditionId string trimming in AutomaticZenRule" into qt-dev am: 600ecb01 am: f6631919 -s ours am: 31b5a325 -s ours am: 2b0f37f2 -s ours am: 52b02cb8 -s ours

am skip reason: subject contains skip directive

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



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