Merge "Allow to re-enable MTE a specified time after a permissive fault" into main am: 3371db1715 am: 60df881563

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3090667

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