Merge "Only allow USER_OWNER to access PDB and change OEM unlock ability" into lmp-mr1-dev
automerge: 36531b3

* commit '36531b33b8e5bb249010f2414ed41d244c571464':
  Only allow USER_OWNER to access PDB and change OEM unlock ability