Merge "Revert "init.rc: stop calling 'fsverity_init --load-verified-keys'"" into main am: 428622bb7f am: 82161b0c05 am: f68b038ec5

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

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

rootdir/Android.bp

@@ -20,7 +20,10 @@ prebuilt_etc {
     name: "init.rc",
     src: "init.rc",
     sub_dir: "init/hw",
-    required: ["platform-bootclasspath"],
+    required: [
+        "fsverity_init",
+        "platform-bootclasspath",
+    ],
 }
 
 prebuilt_etc {

rootdir/init.rc

@@ -649,6 +649,9 @@ on late-fs
     # HALs required before storage encryption can get unlocked (FBE)
     class_start early_hal
 
+    # Load trusted keys from dm-verity protected partitions
+    exec -- /system/bin/fsverity_init --load-verified-keys
+
 # Only enable the bootreceiver tracing instance for kernels 5.10 and above.
 on late-fs && property:ro.kernel.version=4.9
     setprop bootreceiver.enable 0