[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-dev am: bbf3e2ef am: 7ecf0a01 -s ours am: 448b58ff -s ours am: d0ff83fd -s ours

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

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



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