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

Merge "[automerger skipped] Merge "Truncate user data to a limit of 500 characters" into udc-dev am: bbf3e2ef am: ad7ba51c -s ours am: bcca3c87 -s ours" into udc-qpr-dev-plus-aosp am: 6db8e727 -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: Idb4a2fe545d8f82f44a331045b96f0e6d6836917
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>