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

[automerger skipped] RESTRICT AUTOMERGE Clear app-provided shortcut icons am: 1e177458 am: 4c91b1ad -s ours am: 9b8bef07 -s ours am: 629f729e -s ours am: 8e00a7da -s ours am: d6cd22bf -s ours am: d1a70405 -s ours

am skip reason: contains skip directive

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



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