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

[automerger skipped] [DO NOT MERGE] Fix conditionId string trimming in AutomaticZenRule am: 303f6bde am: 7c930d92 -s ours am: 814d0484 -s ours am: 66c6b9de -s ours am: d7320741 -s ours am: 1f368559 -s ours

am skip reason: subject contains skip directive

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



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