Merge "[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: bb23c47240 -s ours" into udc-qpr-dev-plus-aosp