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

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

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



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