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
Change-Id: I6b40c38e1dd75478f7fb3286c486cf5d0960ea62
This commit is contained in: