Merge "RESTRICT AUTOMERGE Clear app-provided shortcut icons" into tm-dev am: 43dc334dcf am: cc0fff5618

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

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