[automerger skipped] Truncate user data to a limit of 500 characters am: e5e5d53c31 -s ours am: 32f1ae65d5 -s ours am: 7fca7c9ff0 -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: Ib5088dea30d4bc15ef5feca3854a910e184f37d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>