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

am skip reason: Merged-In Iae423d93b777df8946ecf1c3baf640fcf74990ec with SHA-1 313a84f033 is already in history

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

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