Merge "Avoid infinite loop in case system_server does not have delete access." into udc-dev am: 1cb2fb8962 am: f8c50163a0

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23507866

Change-Id: If68db03b5de637ac9fc403dcb79cf69b3fcad24f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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;
     }