Merge "Merge "Rename the boot image for avb validation" into rvc-dev am: d7dabee7 am: fcc61eef" into rvc-d1-dev-plus-aosp am: 6802c41f am: 6814b954

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12005766

Change-Id: I944e2f5f09ebdecb947f43be900bf265406347bb