RESTRICT AUTOMERGE Clear app-provided shortcut icons am: cfead1ab1b am: 44669dc94f

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

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