Merge "Fix mtectrl usage message." am: 7281994c12 am: 7682a01289 am: 13a5d02cc8 am: 33fb9f2a92 am: 526a432952

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

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