[automerger skipped] Merge "Fix CtsShortcutHostTestCases#testSecondaryUser" into rvc-dev am: dedd760e am: 2307ccf6 -s ours
am skip reason: Change-Id I8941f5648ad783c7681fdb56677e855756db957d with SHA-1 477c433b is in history
Change-Id: I48f3f0c8d533993d9387cb08750efafad02f60e9