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

[automerger skipped] Limits the display name to 1024 characters am: bf97b0b0 am: 64d63580 -s ours am: 4a411590 -s ours am: 4fbf116f -s ours

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

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



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