Merge "RESTRICT AUTOMERGE Clear app-provided shortcut icons" into udc-dev am: a60b5740

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



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