Merge "Avoid using soong_zip's "-e" flag for boot.zip." am: 94487541 am:...

Merge "Avoid using soong_zip's "-e" flag for boot.zip." am: 94487541 am: 68833432 am: 46a512bc

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



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