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

[automerger skipped] RESTRICT AUTOMERGE Clear app-provided shortcut icons am: cfead1ab am: 44669dc9 am: a7a0ca5f -s ours am: c3e79d80 -s ours

am skip reason: contains skip directive

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



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