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

* commit 'eb485256e99e97653773024951568aadcc60f6a4':
  Camera2 Tests: Fix stream id types