[automerger skipped] [DO NOT MERGE] Fix conditionId string trimming in AutomaticZenRule am: 303f6bde89 am: 7c930d9283 -s ours am: 814d0484b5 -s ours am: 66c6b9de43 -s ours am: d7320741bc -s ours am: 1f3685598a -s ours am: 13ef24a9d6 -s ours

am skip reason: subject contains skip directive

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

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