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

[automerger skipped] Merge "Truncate user data to a limit of 500 characters" into rvc-dev am: a4ddc2b3 am: 09f8c234 -s ours am: 9565105b -s ours am: 230e00c8 -s ours am: 42ccd640 -s ours am: d2b61088 -s ours am: f8ad006d -s ours am: 04dff0e0 -s ours am: 6df1a824 -s ours

am skip reason: skipped by user tetianameronyk

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



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