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

* commit 'e873d897cf5d7e562e203d8839c77fdb3cde74a6':
  CameraITS: Update test_locked_burst threshold