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