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