am b1608f1c: Merge "camera2: Update openCamera calls now that it is async" into klp-dev

* commit 'b1608f1c3e1794a193e1ea6b10b9aef73ccbba40':
  camera2: Update openCamera calls now that it is async