Merge "Add the settings content observer for shortcut preference." into rvc-dev am: a85f5dc80b
am: e65f7a776d
am: 03b27c3278
Change-Id: I3c3454917f283cebc3f57b6cf8d3717704123dc1
This commit is contained in: