Merge "OemLockService: remove canUserAllowOemUnlock()"