Merge "CameraITS: relax test_lock_burst" into marshmallow-cts-dev am: 22f9911a8a
am: 512a69e6c1

* commit '512a69e6c1b17c0e18c06f2fa7fe5f7ed655330c':
  CameraITS: relax test_lock_burst

Change-Id: Id65dc648ca55aeeb6b1be11846a45880e14524eb