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

[automerger skipped] RESTRICT AUTOMERGE Clear app-provided shortcut icons am: 2c3c124e am: dd435db2 -s ours

am skip reason: contains skip directive

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



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