am dc6452af: am 24a36fa3: am 336a9316: Merge "do not allow monkey to flip OEM unlock flag" into lmp-dev

* commit 'dc6452afe82a3d59b32c07a9fa476eb884b89755':
  do not allow monkey to flip OEM unlock flag