[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: e88910ff -s ours am: f57da0b9 -s ours am: 283a9a18 -s ours

am skip reason: subject contains skip directive

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



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