[automerger skipped] Merge "Add UserHandle constants to SystemApi" am: 0a9054639d am: 7b0f06d7d9
am: c56ce9735a -s ours
am skip reason: change_id I261dfcc5cfdfc76bda5d70181785e11c2715a558 with SHA1 ec5f7d1625 is in history

Change-Id: I42503ce9af3ffae674c019f8c7886cbdad05bc2c