[automerger skipped] Merge "[Do Not Merge] Ignore malformed shortcuts" into...

[automerger skipped] Merge "[Do Not Merge] Ignore malformed shortcuts" into sc-v2-dev am: 94f3527c -s ours am: ba518abf -s ours am: 8dcec529 -s ours am: 73cb2d52 -s ours am: 385f421d -s ours

am skip reason: subject contains skip directive

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



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