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

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



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