Merge "Changing FlashTask to take in apply_vbmeta" am: db2372b3 am:...

Merge "Changing FlashTask to take in apply_vbmeta" am: db2372b3 am: f918b0bb am: d8a6775f am: c143722c

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2483695



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