Merge "[mtectrl] resolve race with reboot" am: 54695a8167

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2275247

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