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

* commit '44aacce1e8de2a82c69fa0e0293d26acd32824ae':