Merge "Use new setting key to maintain the list of user assigned shortcut targets." into rvc-dev am: 79d73eaa59 am: 2dc9e9ad76 am: 7afa4dd1be am: 0f90b09ea0
Change-Id: I198f3becc678599e1ae761f99c211e0d50edb0e1
This commit is contained in: