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

[automerger skipped] RESTRICT AUTOMERGE Clear app-provided shortcut icons am: cfead1ab am: 8206ccd8 -s ours

am skip reason: contains skip directive

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



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