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

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

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