Merge "[MTE] Support device_config override in mtectrl." am: 5d962b5728 am: 798edd5f41

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2167579

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