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

[automerger skipped] [DO NOT MERGE] Fix conditionId string trimming in AutomaticZenRule am: 83d23fb2 -s ours am: 8ac57015 -s ours am: 36e633ce -s ours am: 40e1c366 -s ours am: e112434a -s ours

am skip reason: subject contains skip directive

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



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