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

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



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