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

Change-Id: If35e251dbbbca2839529bbb999c6813fb601d1c0