Merge "Include complete boot image on builds containing gki apex" am:...

Merge "Include complete boot image on builds containing gki apex" am: 59dd38cd am: 4689fca0 am: 1b88c0a3 am: 0c9d28bd

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

Change-Id: I12f61775a1db455775a4941043d8c8729ffd2828