Merge changes from topic "fsverity-init-cleanup" into main am: 42164ff920

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2650779

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