[automerger skipped] [DO NOT MERGE] Fix conditionId string trimming in AutomaticZenRule am: 313a84f033 -s ours am: 767ca22ca0 -s ours

am skip reason: subject contains skip directive

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

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