Merge "Only check for powerwash in A/B ota packages" am: 56bca1f2d5 am: 31d74fa4ea

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

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