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: 9d1ae987 -s ours am: 31c2eb63 -s ours am: 70ae1f4e -s ours am: ffeefd07 -s ours" into udc-d1-dev-plus-aosp am: aeccbc58 -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/+/24664788



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