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