[automerger skipped] [Do Not Merge] Ignore malformed shortcuts am: 849dde06...

[automerger skipped] [Do Not Merge] Ignore malformed shortcuts am: 849dde06 -s ours am: 02be4704 -s ours am: b5b9b710 -s ours am: c966a37f -s ours am: 10168a7d -s ours am: 08f55891 -s ours

am skip reason: subject contains skip directive

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



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