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

Change-Id: Ie69c81742f37fce541adbc82461a1cfbc85bd1ff