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

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

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