Merge "DO NOT MERGE: CameraITS: relax test_blackwhite threshold" into marshmallow-cts-dev