[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: cc0fff56 am: 76d65da3 -s ours am: 3a6c7a91 -s ours am: e85c9e32 -s ours

am skip reason: contains skip directive

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



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