Merge changes from topic "boot-image-b280776428" am: 4abf2f45 am: d43471be...

Merge changes from topic "boot-image-b280776428" am: 4abf2f45 am: d43471be am: ad8b896c am: eb394740

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



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