Merge "Add -d parameter to mixed_build script to totally skip vbmeta.img replacement" am: 40575a5424 am: 53bb55f7f5

Original change: https://android-review.googlesource.com/c/platform/development/+/1376216

Change-Id: Ia755560411286e4a25db30e62f6092fb6dd41faf