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

* commit '599b62b06e008241ea39090aa63e930f7adbc8a6':
  Camera2: protect the device access