Merge "Add UserHandle.getAppId to SystemApi"
am: b334bbefd4

Change-Id: I6be04cb335e642921d67a68970078c2cae4af4e7