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: f8c50163 am: a1cbdc9c am: 9f6ce172

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



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