Merge "Prioritize strength error over hardware error" into android15-tests-dev