am 400bcf43: am 0cc7337b: am 020e6d9b: Merge "camera2: Add updateCaptureRequest method" into klp-dev

* commit '400bcf435d003ee73c1bb97bafd8aca7d9b42544':
  camera2: Add updateCaptureRequest method