Merge "ITS: remove 2x application of distortion correction parameters" into android10-tests-dev