[automerger skipped] Merge "Delete legacy fs-verity support" am: 81568fa2...

[automerger skipped] Merge "Delete legacy fs-verity support" am: 81568fa2 am: b4661e27 am: b754030d am: ed3eb039 -s ours

am skip reason: Merged-In I6dacd9bbd38b502ee510ff12970e76342d7b72dd with SHA-1 1fb2d902 is already in history

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

Change-Id: I919fad949c4e4392375abca4473519083d7af80b