Merge changes from topic "nonab_on_vab_r" into rvc-dev am: b62ff1abe3 am: 7875d824f9 am: 4a0485ecbe

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

Change-Id: Ib3754820cce2fd44cd247a62da9149322937f9db