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

Change-Id: I64f2353311978ac585e6a2555adedbe967e23588