[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 skip reason: Merged-In Iae423d93b777df8946ecf1c3baf640fcf74990ec with SHA-1 4ed0f171 is already in history

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



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