[automerger skipped] Merge "Truncate user data to a limit of 500 characters"...

[automerger skipped] Merge "Truncate user data to a limit of 500 characters" into udc-qpr-dev am: abbd1b91 am: 8718a383 -s ours

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

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



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