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

* commit 'e33e3122ef829caf74a15b28a15e1ac7d5c1dd7b':