Merge "Fix CtsShortcutHostTestCases#testSecondaryUser" am: 06ad45a596

Change-Id: Ifb4267fc2e9636865d79fc12677af002ce314b1f