Merge changes I326a4cf2,I1cfce513 into lmp-mr1-dev

* changes:
  Confirm enabling OEM unlock with warning dialog
  Request PIN confirmation to enable OEM unlock