Merge "Do not apply mtectrl state on shutdown if it hadn't been loaded" into main am: 809ed91eb9

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

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