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

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

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