Merge "Run mtectrl later in boot sequence" into main am: fd6ea7e04e am: c1049f19e1

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2765456

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