[automerger skipped] Merge "RESTRICT AUTOMERGE Clear app-provided shortcut icons" into sc-dev am: 40656631c5 am: 3be0af36be -s ours am: 9e1c27f1d2 -s ours am: 289786cdf9 -s ours am: 021278f83a -s ours

am skip reason: contains skip directive

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

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