Merge "Add more tests for mtectrl override" into main am: bd015a64bd

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

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