Merge "Revert^2 "Determine build_ota_package based on recovery.fstab install...

Merge "Revert^2 "Determine build_ota_package based on recovery.fstab install location"" into main am: 90ed0c95

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



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