Merge "[DO NOT MERGE] Fix conditionId string trimming in AutomaticZenRule" into qt-dev am: 600ecb01

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



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