am 1978cc0d: am 9a7dd5b3: am d1a7c8d4: Merge "CameraITS: Update test_locked_burst threshold" into lollipop-mr1-cts-dev

* commit '1978cc0d3e52f79f72904b6e7ce4b36d1a70f9f8':
  CameraITS: Update test_locked_burst threshold