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

am: dac257d27c

Change-Id: If35e251dbbbca2839529bbb999c6813fb601d1c0

api/system-current.txt

@@ -4305,6 +4305,7 @@ package android.os {
   }
 
   public final class UserHandle implements android.os.Parcelable {
+    method public static int getAppId(int);
     method public int getIdentifier();
     method @Deprecated public boolean isOwner();
     method public boolean isSystem();

core/java/android/os/UserHandle.java

@@ -226,6 +226,7 @@ public final class UserHandle implements Parcelable {
      * @hide
      */
     @TestApi
+    @SystemApi
     public static @AppIdInt int getAppId(int uid) {
         return uid % PER_USER_RANGE;
     }