[automerger skipped] Merge "Disable MTE developer option if device config overrides it" into udc-dev am: c5054d5907
am: 6fe481b424
-s ours
am skip reason: Merged-In Idd249e060a275b58a399349f202fc68b42964eb0 with SHA-1 65116faa29
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21548006
Change-Id: I2b47da0582aa68442e182e50edeebf0822af2cc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: