Merge "Look for radio.img and bootloader.img in ANDROID_PRODUCT_OUT" into main am: 1c77579a06 am: 6471b231d7 am: 730d82c236 am: 4472827bdc

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2660282

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