[automerger skipped] [DO NOT MERGE] Fix conditionId string trimming in AutomaticZenRule am: 313a84f033 -s ours

am skip reason: subject contains skip directive

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

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