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

[automerger skipped] Merge "RESTRICT AUTOMERGE Clear app-provided shortcut icons" into udc-dev am: a60b5740 am: 35701784 -s ours

am skip reason: Merged-In I3d80fedab9ef547ef3ac54eaccf2aa048a180be9 with SHA-1 7cd3d089 is already in history

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



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