Merge "Use bootloader_override from boot namespace" am: 4ac2551a27 am: 105c0a7d5c

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

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