[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-dev am: 209b8371 -s ours

am skip reason: Merged-In Iae423d93b777df8946ecf1c3baf640fcf74990ec with SHA-1 313a84f0 is already in history

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



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