[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 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: I1b8f3ce03ed44a8116cc4ed7e91d05e75b42f356
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>