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

[automerger skipped] Merge "RESTRICT AUTOMERGE Clear app-provided shortcut icons" into tm-dev am: 43dc334d am: 3f0fc1f2 -s ours am: ff85060e -s ours am: aa046584 -s ours

am skip reason: contains skip directive

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



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