Merge "Up to date apps must provide conversation shortcuts" into rvc-dev am:...
Merge "Up to date apps must provide conversation shortcuts" into rvc-dev am: c79df044 am: c7f7d095 am: 1e7bf8cf am: 57cd8f93
Change-Id: Ia4155d6117e90881d807394004a828301820572c