[automerger skipped] Merge "RESTRICT AUTOMERGE Clear app-provided shortcut...

[automerger skipped] Merge "RESTRICT AUTOMERGE Clear app-provided shortcut icons" into sc-dev am: 40656631 am: 3be0af36 -s ours

am skip reason: contains skip directive

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



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