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
This commit is contained in:
committed by
Android (Google) Code Review
commit
6dbeabb7c9