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

am skip reason: subject contains skip directive

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

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