Merge "Reland "Remove legacy/O/O-MR1 matrices."" am: a53f69e158

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

Change-Id: I255eb47ffce9881741a56b2c34a734c257d4769f