Merge "Added content of mUserIds and mUserStates to 'dumpsys user'"