Merge "Perform data wipe in recovery if ota package has powerwash set" am:...

Merge "Perform data wipe in recovery if ota package has powerwash set" am: 266a01b7 am: 01f1e6cd

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1985507

Change-Id: I99a1737df9d4fddfc0f810ea9b5aa6c8c0bfab8e