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

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



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