[automerger skipped] [DO NOT MERGE] Fix conditionId string trimming in AutomaticZenRule am: 53d493b0e5 -s ours am: c8962de314 -s ours

am skip reason: subject contains skip directive

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

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