Merge "Camera3Device: fix dereferencing null pointer crash" into nyc-dev am: 14fd3a1e2a
am: ac55412469

* commit 'ac554124699adbef4d24981a90591b19b4e6573f':
  Camera3Device: fix dereferencing null pointer crash