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

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



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