Merge "Add the settings content observer for shortcut preference." into rvc-dev am: 31e6002ee8
am: 6c2c23f325
am: 3ea590efe4
Change-Id: Id63a7c7b58825bca865cf2cd6e894b92e419cc00
This commit is contained in: