[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: 89953b28 -s ours am: b6cad3c0 -s ours am: a8b64ee5 -s ours

am skip reason: subject contains skip directive

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



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