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

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

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