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