[automerger skipped] Merge "Trim any long string inputs that come in to AutomaticZenRule" into tm-dev am: de7b49d170 am: bb36470dd7 am: e53f8dd450 -s ours am: ebdbf2027e -s ours
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 d4b5212eb6 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19816377
Change-Id: I7c87ac6b223e5ccd2ad13c2cfea2a74ec162f916
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: