am 698615d9: am b9b540f6: Merge "Camera2: Update tests to use different API." into klp-dev

* commit '698615d9fde9b917b65508acc416bd58a33ce864':
  Camera2: Update tests to use different API.