[automerger skipped] Merge "Enable uploading ramdisk to target img.zip" am:...

[automerger skipped] Merge "Enable uploading ramdisk to target img.zip" am: 07445235 am: 2a3ab163 am: 38fe00fb am: d3b621c8 -s ours

am skip reason: Change-Id Id29408551cd41c11b96157248e238324a327043d with SHA-1 b582e0f4 is in history

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

Change-Id: I6c782b9690bd6ce82185fbf0ecc8c5a0b283a8d1