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

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



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