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