[automerger skipped] [Do Not Merge] Ignore malformed shortcuts am: 849dde06 -s ours

am skip reason: subject contains skip directive

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



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