Merge "RESTRICT AUTOMERGE Clear app-provided shortcut icons" into sc-dev am: 40656631

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



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