Merge "Allow setting --boot_variable_file in build-ota-package-target" into...

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

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



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