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

[automerger skipped] Merge "[Do Not Merge] Ignore malformed shortcuts" into qt-dev am: 8a2baf4e am: de5113ee -s ours am: 2fcbfbf6 -s ours am: 725961fb -s ours am: d0836243 -s ours am: 98210db2 -s ours am: 4e7d4c2c -s ours

am skip reason: subject contains skip directive

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



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