Merge "Added some error logs to wipe" am: 719caca725

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2512335

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