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

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

Change-Id: Ic75b66713e8a30b56118238c371c29005fbab994