Merge "[automerger skipped] Merge "Truncate user data to a limit of 500 characters" into udc-dev am: bbf3e2efaa am: ad7ba51ceb -s ours am: bcca3c8741 -s ours" into udc-qpr-dev-plus-aosp