Merge "Merge "Prioritize strength error over hardware error" into android15-tests-dev am: 4998bb62e2" into main