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: 2a6ed5fe am: 11610ce9 am: db9c985e
Change-Id: Ib853d457cd8ba2109ed0a18e9f90cc996f5f1aa8