Merge "[MTE] Add device config to control upgrade time" am: 84a30c8526 am: 04378de425 am: 5197e9722f

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

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