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

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

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



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