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

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

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



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