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