Merge "ITS: snap to Sony's final test_aspect_ratio_and_crop CL" into stage-aosp-sc-ts-dev