[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: e1db2fe6 -s ours am: 56d11db9 -s ours am: 9238480a -s ours am: c75ce033 -s ours am: efe6ddb1 -s ours am: 7b83a61a -s ours

am skip reason: subject contains skip directive

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



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