Merge "Add the settings content observer for shortcut preference." into rvc-dev am: 31e6002ee8 am: 6c2c23f325 am: 3ea590efe4 am: 376e5dd4a7
Change-Id: I13b8f3aacc5b7774f839f7a289cb7fe133d78aa6
This commit is contained in: