Merge "Add threshold tolerance for NinePatchTest" into android12-tests-dev