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

* commit '9a7dd5b3e2222f71fc33e4b38e5cab5d5d20c222':
  CameraITS: Update test_locked_burst threshold