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

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

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