Merge "Move bootloader_override property" am: 70160bcb13

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

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