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

[automerger skipped] [DO NOT MERGE] Fix conditionId string trimming in AutomaticZenRule am: 313a84f0 -s ours am: 767ca22c -s ours am: 25e290d0 -s ours am: 4ede6e57 -s ours am: 83ba716b -s ours

am skip reason: subject contains skip directive

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



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