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: 4872ac60

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



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