Merge "Support fs-verity setup with null/no signature" am: 52d2b21a47

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2351935

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