Merge "OemLockService: remove canUserAllowOemUnlock()" into oc-mr1-dev
am: 5664b30008

Change-Id: Ie38c731b4e1119e8cef707cd58e4f32ab68a7d1b