Merge "Expose isUserKeyUnlocked as a TestAPI" into sc-dev

core/api/test-current.txt

@@ -1640,6 +1640,7 @@ package android.os.storage {
   public class StorageManager {
     method @NonNull public static java.util.UUID convert(@NonNull String);
     method @NonNull public static String convert(@NonNull java.util.UUID);
+    method public static boolean isUserKeyUnlocked(int);
   }
 
   public final class StorageVolume implements android.os.Parcelable {

core/java/android/os/storage/StorageManager.java

@@ -1536,6 +1536,7 @@ public class StorageManager {
     }
 
     /** {@hide} */
+    @TestApi
     public static boolean isUserKeyUnlocked(int userId) {
         if (sStorageManager == null) {
             sStorageManager = IStorageManager.Stub