[automerger skipped] Avoid using soong_zip's "-e" flag for boot.zip. am:...

[automerger skipped] Avoid using soong_zip's "-e" flag for boot.zip. am: c63a2b36 -s ours am: ec6b438c -s ours

am skip reason: Merged-In I769de5194b5716f05e5352f4efd635a70ba0b891 with SHA-1 34914f62 is already in history

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



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