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