Merge "Add UserHandle constants to SystemApi"
am: 0a9054639d

Change-Id: I2652807a0a44b885abe00c8ec64b14de503db2b7