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

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