Merge "Allow setting --boot_variable_file in build-ota-package-target" into main am: 5e6df98f

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



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