[automerger skipped] [DO NOT MERGE] Fix conditionId string trimming in AutomaticZenRule am: 83d23fb275 -s ours am: 8ac57015f3 -s ours am: 36e633cea9 -s ours am: 40e1c366cb -s ours

am skip reason: subject contains skip directive

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

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