Merge "vts_fs_test: checks AVB 1.0 isn't used" am: c89e97f6 am: 1c64425b...

Merge "vts_fs_test: checks AVB 1.0 isn't used" am: c89e97f6 am: 1c64425b am: 5b2b2848 am: d536acd2

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



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