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

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



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