Merge "Removes shortcut target when an a11y service is unbound" into rvc-dev am: a0b9a209e1

Change-Id: I110ec706e4909bf227d11e80e80b3839a72be57c