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 sc-v2-dev am: 24080817 am: fe790c66 am: 9ab9f1c4 -s ours am: c652a4e5 -s ours am: 75268507 -s ours am: bb23c472 -s ours" into udc-qpr-dev-plus-aosp am: eeaf00b4 -s ours

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

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



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