[automerger skipped] RESTRICT AUTOMERGE Clear app-provided shortcut icons am: cb890a0619 -s ours am: f97362b8d3 -s ours am: b11c6a0e90 -s ours am: 3a40a71578 -s ours am: 5dff51708e -s ours am: bb9266f85d -s ours am: 9e583ac9f4 -s ours

am skip reason: contains skip directive

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

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