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

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

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