Merge "[automerger skipped] Truncate user data to a limit of 500 characters...

Merge "[automerger skipped] Truncate user data to a limit of 500 characters am: e5e5d53c -s ours am: 32f1ae65 -s ours am: 187a8ce4 -s ours" into udc-d1-dev-plus-aosp am: 984a4dc3 -s ours am: 71ed81b2 -s ours

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

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



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