[automerger skipped] DO NOT MERGE - Added user flags to 'dumpsys user' am: 4490995f1b
am: cc0b16a0c9 -s ours
am skip reason: subject contains skip directive

Change-Id: I24986ee370d7d51833a71faf232ef83cb99ec83b