am 3581f4c9: Merge "Avoid crashing on startup when policy forbids lockscreen...
am 3581f4c9: Merge "Avoid crashing on startup when policy forbids lockscreen camera." into lmp-mr1-dev
* commit '3581f4c9':
Avoid crashing on startup when policy forbids lockscreen camera.