[automerger skipped] RESTRICT AUTOMERGE Clear app-provided shortcut icons am:...

[automerger skipped] RESTRICT AUTOMERGE Clear app-provided shortcut icons am: cb890a06 -s ours am: f97362b8 -s ours am: b11c6a0e -s ours am: 3a40a715 -s ours am: 5dff5170 -s ours am: bb9266f8 -s ours

am skip reason: contains skip directive

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



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