Merge "Fix CtsShortcutHostTestCases#testSecondaryUser" am: 06ad45a596 am: 8ff2a45090

Change-Id: I89e3959fc78eb19c08300564183871abe769f5d9