Merge "Move ScanResultMatchInfo to its own class" into oc-dr1-dev
am: 60b2a0be06

Change-Id: I133feaf52a0454878226c38854f526b5401cf223