am c989d2d4: am 1dd08b30: Merge "Camera2/3: Add more tracing for API1" into klp-dev

* commit 'c989d2d4f6f7e63b1572673b390a5e89fa5c5702':
  Camera2/3: Add more tracing for API1