Merge "Resolve conflict AVB rollback index location" into main am: 76458511 am: a503a562

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



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