Merge "Do not require fs-verity built-in signature" am: 670ca4f29d

Original change: https://android-review.googlesource.com/c/platform/system/security/+/2281348

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