Detect non-A/B vs. A/B packages correctly. am: 2a4afd29a1 am: 672fec0538

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

Change-Id: I41ed8e550c402afd7081baa93bca256e63d56ae1