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

[automerger skipped] Limits the display name to 1024 characters am: ef09701a -s ours am: 5cdc1304 -s ours am: 2aecfafa -s ours am: 5b226064 -s ours

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

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



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