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

[automerger skipped] Truncate user data to a limit of 500 characters am: 46caac64 am: 3cab4d36 -s ours am: edb2dd74 -s ours am: 4606deec -s ours am: 1ae3a9e6 -s ours am: c784d7b3 -s ours am: a9489132 -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/+/24993589



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