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

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



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