Merge "Added some error logs to wipe" am: 719caca7 am: 58d9dd70 am: 454eb2a7 am: 0c697640

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



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