[automerger skipped] Merge "DO NOT MERGE - Added user flags to 'dumpsys user'" into qt-qpr1-dev am: 3ea014ca6d
am: 81627a9757 -s ours
am skip reason: subject contains skip directive

Change-Id: I8399e119e49a61060202b9ad020cc8d0f91ffd59