[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: 367e6e98 -s ours

am skip reason: subject contains skip directive

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



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