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 am: 51b7325a

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



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