Merge "Merge "Set shortcut info even if metadata doesn't have shortcut id" into rvc-dev am: a5ac201acd am: 87ee1802a7 am: 23c2510f0f" into rvc-qpr-dev-plus-aosp