[automerger skipped] Merge "[Do Not Merge] Ignore malformed shortcuts" into...

[automerger skipped] Merge "[Do Not Merge] Ignore malformed shortcuts" into sc-v2-dev am: 94f3527c -s ours am: ba518abf -s ours am: 7276f812 -s ours am: 97700a04 -s ours am: 4f82e972 -s ours am: f7bde983 -s ours am: 36c68fe8 -s ours

am skip reason: subject contains skip directive

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



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