[automerger skipped] Merge "Move MTE mode settings to a product variable."...

[automerger skipped] Merge "Move MTE mode settings to a product variable." into udc-d1-dev am: 566cad2c -s ours am: 32f8fba7 -s ours

am skip reason: Merged-In I5954fde05256e00a8e01c114ad522f50ed0cfa9f with SHA-1 80b53b8c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23623917



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