Merge "Merge "Revert "Add the settings content observer for shortcut preference."" into rvc-dev am: 9ae5b47aee am: 546c130e8d am: 88bf32682b" into rvc-qpr-dev-plus-aosp am: 6dbeabb7c9 am: 265b3f9434
Change-Id: Ia4fde645796dfd1446699d1aeb7bed0bbb810d45
This commit is contained in: