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