Merge "Stop building boot-with-debug-*.img for GKI" am: 32c53b4f3c am: d5512c01dd am: 1570d6eb7d

Original change: https://android-review.googlesource.com/c/device/generic/common/+/1839956

Change-Id: I5cb04616d9d014215ed3a27fb6affa2734e3e335