Merge "Merge "Updates for msg apps that don't use shortcuts" into rvc-dev am: 6f482cef09 am: dcba11ba82" into rvc-d1-dev-plus-aosp am: 8bb8384164 am: 614a41c3d0 am: 628c8fcb96
Change-Id: I5d3afe6fd17ea867a56e598c7c260a4981398f47
This commit is contained in: