Simplify Matcher code and apply formatting

Bug: 299062874
Test: HumanEyeMatcherTest, AlmostPerfectMatcherTest
Change-Id: I79f2b4e92dfdeb641fe2be6a537cb9624bb38e44
2 files changed