[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 skip reason: subject contains skip directive

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



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