[automerger skipped] Merge "Modified ShortcutManagerMultiuserTest.testSecondaryUser to use existing secondary user if possible and switch to initial user at tearDown" into pie-cts-dev am: 8ee595d40c
am: c8f91e739c -s ours
am skip reason: change_id Ie3437657a6ecd0be9b9fb11b5acbd440adf0b934 with SHA1 99bbf90c8c is in history

Change-Id: Id432e9f925cfa69bd3705fa839727c5337dd58b5