[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 skip reason: contains skip directive

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



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