Merge "Avoid infinite loop in case system_server does not have delete access."...

Merge "Avoid infinite loop in case system_server does not have delete access." into udc-dev am: 1cb2fb89 am: 79130016 am: 810db14c am: d1529e34

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



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