Merge "Revert "Add the settings content observer for shortcut preference."" into rvc-dev am: 9ae5b47aee am: b726331702 am: 51b2b3d876
Change-Id: Idf9eb1717dd96ab62de603f36ac1fc7a8a6c082b
This commit is contained in: