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

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

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