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

Change-Id: I4ab95e6114546f01648a949b5712b7a609319684