Merge "[Do Not Merge] Ignore malformed shortcuts" into qt-dev am: 8a2baf4e

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



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