Merge "Retry the dir deletion if can't rename." am: d2ed995e

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2047963



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