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

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

Change-Id: Id3771a7550db51249bad8b7081de038bdd55fb71