Merge "Use new setting key to maintain the list of user assigned shortcut targets." into rvc-dev am: 79d73eaa59
am: faa9c3b033
am: 41dc7111e7
am: dfad24c4f4
am: bc7b1b4f12
Change-Id: I178e6e950a6df4e6dceab76c898314ed18e87bed
This commit is contained in: