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

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