[automerger skipped] Merge "Add flag whether MTE state was forced" into...

[automerger skipped] Merge "Add flag whether MTE state was forced" into udc-qpr-dev am: e03eed2c -s ours am: 785dcd3d -s ours

am skip reason: Merged-In I6178f0b88b718e96e5c8ee39113848f422e5fb6d with SHA-1 9ff55496 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/24121848



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