[automerger skipped] Merge "use @SystemAPI for creating UserHandle" am: 420bf71217 am: e207bff221 am: e62f727fdb
am: 1fbe02f117 -s ours
am skip reason: change_id Id2a696bed6a80c92291c8f968f3aaa8db6bb83df with SHA1 59d76e97bb is in history

Change-Id: I4f85a86c3120ab175b32e4317c71c69aa6c4eb46