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

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



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