Merge changes from topic "revert-1959735-NUPGEQOUCB" into android12-tests-dev

* changes:
  RESTRICT AUTOMERGE Revert "Add policy for command line tool to control MTE boot state."
  RESTRICT AUTOMERGE Revert "Move mtectrl to private"