Merge "Avoid infinite loop in case system_server does not have delete access." into udc-dev

services/core/java/com/android/server/pm/ResilientAtomicFile.java

@@ -230,7 +230,9 @@ final class ResilientAtomicFile implements Closeable {
                             + Log.getStackTraceString(e));
         }
 
-        mCurrentFile.delete();
+        if (!mCurrentFile.delete()) {
+            throw new IllegalStateException("Failed to remove " + mCurrentFile);
+        }
         mCurrentFile = null;
     }