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

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

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