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

[automerger skipped] [DO NOT MERGE] Fix conditionId string trimming in AutomaticZenRule am: 4ed0f171 -s ours am: 2e073adf -s ours am: 4a1e52a3 -s ours am: b28580e8 -s ours am: 59636a2f -s ours

am skip reason: subject contains skip directive

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



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