Merge "Revert "Remove legacy/O/O-MR1 matrices."" am: 305fa1d5fe am: d94f245a21 am: a6e96e9a80 am: a114b4bdbc

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

Change-Id: I582a5df60ac316dabbde57025cecb021161f1167