Merge "When a shortcut is deleted remove it from xml as well" into sc-v2-dev am: 980e3e78

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

Change-Id: I472b0b0f1aa893eaf2799ed11c650414a1233fc5