[automerger skipped] Merge "Support fs-verity setup with null/no signature"...

[automerger skipped] Merge "Support fs-verity setup with null/no signature" am: 52d2b21a am: f56d37a8 am: 34ef33bf -s ours

am skip reason: Merged-In I119e5189603af888dfa1ece2bee9e7635120854b with SHA-1 314dd4c0 is already in history

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



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