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

[automerger skipped] Merge "[DO NOT MERGE] Fix conditionId string trimming in AutomaticZenRule" into sc-dev am: 67168d88 -s ours am: 7a135016 -s ours am: 9c4b723f -s ours am: ec04eb74 -s ours am: 14273efd -s ours

am skip reason: subject contains skip directive

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



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