[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-qpr1-dev am: bafc7d40 -s ours am: d9e5df8f -s ours am: 15e1002b -s ours am: 4a185f13 -s ours

am skip reason: subject contains skip directive

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



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