[automerger skipped] RESTRICT AUTOMERGE Clear app-provided shortcut icons am:...

[automerger skipped] RESTRICT AUTOMERGE Clear app-provided shortcut icons am: cfead1ab am: 8206ccd8 -s ours am: 39caf127 -s ours am: 06e3e65a -s ours am: f461ccf9 -s ours

am skip reason: contains skip directive

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



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