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

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



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