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