Merge "Move bootloader_override property" am: 70160bcb13 am: f9ca8ee9b1 am: 0536eeb071

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2506665

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