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

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

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



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