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

am skip reason: Merged-In Iae423d93b777df8946ecf1c3baf640fcf74990ec with SHA-1 4ed0f171be is already in history

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

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