am 32bf9c8e: am eb485256: Merge "Camera2 Tests: Fix stream id types" into klp-dev

* commit '32bf9c8ecc682ddd00b915554bb15182086b4af4':
  Camera2 Tests: Fix stream id types