Merge "CameraITS: Update test_locked_burst threshold" into lollipop-mr1-cts-dev