[automerger skipped] RESTRICT AUTOMERGE Clear app-provided shortcut icons am: cfead1ab1b am: 8206ccd873 -s ours am: 39caf1273d -s ours am: dac6d87a21 -s ours

am skip reason: contains skip directive

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

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