Merge "Fix mtectrl usage message." am: 7281994c12 am: 7682a01289 am: 13a5d02cc8

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

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