Merge "Merge "Set shortcut info even if metadata doesn't have shortcut id" into rvc-dev am: a5ac201acd am: 4b435d7128" into rvc-d1-dev-plus-aosp