Merge "Removing --apply-vbmeta for vbmeta_system" am: d97f8505 am: a5b20d6e am: 85c879e4

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



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