[automerger skipped] Limits the display name to 1024 characters am: c770b9ef...

[automerger skipped] Limits the display name to 1024 characters am: c770b9ef am: 8b67189c -s ours am: 887bca60 -s ours

am skip reason: Merged-In I29e050c498e813e291af213ce4ddc590559c8b7d with SHA-1 cea95b15 is already in history

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



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