[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-v2-dev am: 4f7306e7 -s ours am: 7226d344 -s ours am: a0fdae16 -s ours am: 7a0fed65 -s ours

am skip reason: subject contains skip directive

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



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