Merge "Remove legacy/O/O-MR1 matrices." am: 0d7adccb53

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1465685

Change-Id: I7ad6bc590d5f89e4cdb99e14e160d8391fd2cad2