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

* commit '8154560fb349190e3313a1e3183cc0a3b157d57e':
  CameraITS: Update test_locked_burst threshold