Merge "Ignore malformed shortcuts" into tm-dev am: 9bce00406b

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

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