[automerger skipped] Merge "Trim any long string inputs that come in to...

[automerger skipped] Merge "Trim any long string inputs that come in to AutomaticZenRule" into sc-qpr1-dev am: 0da78aac -s ours am: 8de41350 -s ours am: ce97650a -s ours am: 20e6d6b0 -s ours

am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 3d850458 is already in history

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



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