[automerger skipped] Truncate user data to a limit of 500 characters am: e5e5d53c31 -s ours am: 32f1ae65d5 -s ours am: b5bbb59345 -s ours

am skip reason: Merged-In I633dc10974a64ef2abd07e67ff2d209847129989 with SHA-1 59042a32c7 is already in history

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

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