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: Iac3b16d818c25bd23b3939bc6c192e26e20ff354
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>