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

[automerger skipped] Merge "[DO NOT MERGE] Fix conditionId string trimming in AutomaticZenRule" into rvc-qpr-dev am: 1123e29a -s ours am: 5439a348 -s ours am: bc48ffae -s ours am: 147834cc -s ours am: f9ebb556 -s ours am: b16e6def -s ours

am skip reason: subject contains skip directive

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



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