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

[automerger skipped] [DO NOT MERGE] Fix conditionId string trimming in AutomaticZenRule am: 7533d042 -s ours am: 856f177e -s ours am: 708f170d -s ours am: c75f54a8 -s ours am: 3bd48880 -s ours am: 713ba2ae -s ours

am skip reason: subject contains skip directive

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



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