[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 skip reason: subject contains skip directive

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



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