Merge "ITS: Handle non 4:3 ARs in test_tonemap_curve.py" into stage-aosp-sc-ts-dev