Merge "[Do Not Merge] Ignore malformed shortcuts" into sc-dev am: e667a6bf

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



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