Merge "Expose UserHandle.getIdentifier() to CTS." into oc-dev

api/test-current.txt

@@ -31848,6 +31848,7 @@ package android.os {
     ctor public UserHandle(android.os.Parcel);
     method public int describeContents();
     method public static int getAppId(int);
+    method public int getIdentifier();
     method public static android.os.UserHandle getUserHandleForUid(int);
     method public static android.os.UserHandle readFromParcel(android.os.Parcel);
     method public void writeToParcel(android.os.Parcel, int);

core/java/android/os/UserHandle.java

@@ -344,6 +344,7 @@ public final class UserHandle implements Parcelable {
      * @hide
      */
     @SystemApi
+    @TestApi
     public @UserIdInt int getIdentifier() {
         return mHandle;
     }