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

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



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