Merge "Camera2: protect the device access" into nyc-dev
am: e7d45e3ff9

* commit 'e7d45e3ff9358293f27ce1add94af34908a6a263':
  Camera2: protect the device access