Merge "Introduce boot_image_type property in bootimg module" into main am:...

Merge "Introduce boot_image_type property in bootimg module" into main am: 517c6f81 am: d33c6c52

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



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