Merge "Enforce permission before checking OEM unlocking setting" into nyc-mr1-dev