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
Change-Id: I9bf34f9c451a8b1e864ee9a60363c0d81e7e48cd
This commit is contained in: