Merge "Fix error log message for rename(2) workaround" am: 4ed8f88e am:...

Merge "Fix error log message for rename(2) workaround" am: 4ed8f88e am: b9d37026 am: 095a6307 am: 1d028b06 am: 943c159a

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



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