Merge "Match more leniant sceenshot comparison of existing tests" into stage-aosp-tm-ts-dev