Merge "Fix CtsShortcutHostTestCases#testSecondaryUser" into rvc-dev