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

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

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