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

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

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