Merge "Add the settings content observer for shortcut preference." into rvc-dev am: a85f5dc80b
am: e65f7a776d
am: ad881b4878
am: 2d8c1821c2
Change-Id: Ie2534fb8725a24704db04a2ca021d2192c64ebb4
This commit is contained in: