[automerger skipped] Merge "Fix CtsShortcutHostTestCases#testSecondaryUser" into rvc-dev am: dedd760e -s ours am: 41eaf40e -s ours
am skip reason: Change-Id I8941f5648ad783c7681fdb56677e855756db957d with SHA-1 926e83a4 is in history
Change-Id: I4f08d6e3fa69ef05167a1a13570f071592ec235c