Merge "[Do Not Merge] Ignore malformed shortcuts" into rvc-dev am: 9e3aecfce1

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

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