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