Merge "Increase tolerance for screenshot color verification in BlurTests" into stage-aosp-sc-ts-dev