[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: fb73a81e -s ours am: 46232e53 -s ours

am skip reason: subject contains skip directive

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



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