Merge "do not allow monkey to flip OEM unlock flag" into lmp-dev