[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: c4c13f6a -s ours am: 411a8b67 -s ours am: 7e4e9721 -s ours

am skip reason: subject contains skip directive

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



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