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

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

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