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

am skip reason: subject contains skip directive

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

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