[automerger skipped] [automerge] [Do Not Merge] Ignore malformed shortcuts 2p: 36338a31 am: 884c1460 -s ours am: c9d1aed2 -s ours am: 979d92a8 -s ours am: c83dd231 -s ours am: 5c6ae4c1 -s ours am: 7ea617cb -s ours

am skip reason: subject contains skip directive

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



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