Merge "use @SystemAPI for creating UserHandle"
am: 420bf71217

Change-Id: Ic9f389eefd4b7c4d519ff073fb0ef95c3d3dd3b1