[automerger skipped] Merge "Fix fs-verity API for secondary users" into main am: 7f358de742 am: 13dbdc0fc3 -s ours

am skip reason: Merged-In I4090792afaf05c3dff5cb34731ef7030243196c2 with SHA-1 9336614afd is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2913524

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