[automerger skipped] Merge "Fix imprecise name of a fs-verity helper function"...

[automerger skipped] Merge "Fix imprecise name of a fs-verity helper function" am: 2af62aa3 am: 8c3b9380 am: 281db21f -s ours

am skip reason: Merged-In I12c2a4ac57fb8772483473f951e97474ebd894c9 with SHA-1 0e49df44 is already in history

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



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