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

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



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