Merge "Add the settings content observer for shortcut preference." into rvc-dev am: 31e6002ee8 am: 380e0dc235 am: 58779cd226 am: 15d94daf38

Change-Id: I1f69480ee004d48fba57344959c39445be7717d8