[automerger skipped] [DO NOT MERGE] Fix conditionId string trimming in...

[automerger skipped] [DO NOT MERGE] Fix conditionId string trimming in AutomaticZenRule am: 53d493b0 -s ours am: c8962de3 -s ours am: c27328be -s ours am: 200c5561 -s ours

am skip reason: subject contains skip directive

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



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