Merge "Fix the signing error on no-system-image targets" am: 790214a4 am:...

Merge "Fix the signing error on no-system-image targets" am: 790214a4 am: ba922579 am: 2a00929d am: 50bf9c8a

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

Change-Id: Ie9d4557587a1df9267d1a00ee97d4f46ec8d3ac2