[automerger skipped] Merge "Delete legacy fs-verity support" am: 81568fa22f am: b4661e274c am: b754030dbe am: ed3eb039b8 -s ours
am skip reason: Merged-In I6dacd9bbd38b502ee510ff12970e76342d7b72dd with SHA-1 1fb2d90296 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1966068
Change-Id: I919fad949c4e4392375abca4473519083d7af80b
This commit is contained in: