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

Merge "Merge "Ignore malformed shortcuts" into tm-dev am: 9bce0040 am: 3adfd733 am: eedfcde1" into tm-qpr-dev-plus-aosp am: ed37d3ce

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



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