am d77d1e41: am 436a2749: Merge "Camera: further relax legacy capture latency timeout" into lollipop-mr1-cts-dev

* commit 'd77d1e418a0b17e8c947a797bad8a8f5ae3db269':
  Camera: further relax legacy capture latency timeout