[automerger skipped] Truncate user data to a limit of 500 characters am:...

[automerger skipped] Truncate user data to a limit of 500 characters am: e5e5d53c -s ours am: 32f1ae65 -s ours am: b5bbb593 -s ours am: 0a67ee05 -s ours am: faa6685d -s ours

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

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



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