Merge "DO NOT MERGE CameraITS: scene1/test_linearity change fit to len(sensitivies)" into nougat-mr1-cts-dev
am: 49f56c1418  -s ours

Change-Id: I3f5d63baa09dcd1ab305f1e40d873a4fb22a7491