Merge "Delete legacy fs-verity support" am: 81568fa22f am: b4661e274c

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

Change-Id: I797f197a29a811795fc5be5339be1afbde2e5fcd