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

[automerger skipped] Merge "[Do Not Merge] Ignore malformed shortcuts" into sc-dev am: e667a6bf am: f259cf50 -s ours am: f88c3bc8 -s ours am: e7ef7b04 -s ours am: 608a6a99 -s ours

am skip reason: subject contains skip directive

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



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