Merge "Expose `--avb_resolve_rollback_index_location_conflict`" into main am:...

Merge "Expose `--avb_resolve_rollback_index_location_conflict`" into main am: 4605c0ec am: 60046f4d

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



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