[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: 9e1c27f1 -s ours am: 289786cd -s ours am: 034e6dbe -s ours am: 0c26b2c2 -s ours

am skip reason: contains skip directive

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



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