Merge "Use the current user rather than USER_SYSTEM as default user for AccountManagerServiceShellCommand" into qt-qpr1-dev am: 1a89a00e8c
am: 99a2534b07

Change-Id: I757bf187ed82b7ca87f34eb5277252e19c80c0be