Merge "[automerger skipped] Export boot image files from...

Merge "[automerger skipped] Export boot image files from prebuilt_apex/apex_set am: b508405e am: 1b147bfc -s ours" into sc-v2-dev-plus-aosp am: dee0567d -s ours

am skip reason: Merged-In I1d4d9545172d79282918130df6b9aa55471bffc1 with SHA-1 b508405e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15027898

Change-Id: Ide4930c623dabef041dbc52eabfe48bf61f27fa1