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

* commit 'e6a4b445944489d67d40c8f52322fb149290fcf8':
  Avoid crashing on startup when policy forbids lockscreen camera.