[automerger skipped] Merge "Truncate user data to a limit of 500 characters" into sc-v2-dev am: 240808177e am: fe790c6685 am: 9ab9f1c425 -s ours am: c652a4e525 -s ours am: 75268507ad -s ours

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

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

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