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

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

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