Merge "Fix CtsShortcutHostTestCases#testSecondaryUser"