[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 am: e950b9be -s ours

am skip reason: Merged-In I5954fde05256e00a8e01c114ad522f50ed0cfa9f with SHA-1 5c8434d1 is already in history

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



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