Merge "Modified ShortcutManagerMultiuserTest.testSecondaryUser to use existing secondary user if possible and switch to initial user at tearDown" into pie-cts-dev