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

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

Change-Id: I08665b80df208d40b2e48c341dd5ab98f24fe53c