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

[automerger skipped] Merge "[Do Not Merge] Ignore malformed shortcuts" into rvc-dev am: 9e3aecfc am: f5529518 -s ours am: c03b0e2d -s ours am: 24691751 -s ours am: 6ed89575 -s ours am: 10994096 -s ours am: 0bbb0e7c -s ours

am skip reason: subject contains skip directive

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



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