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

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

Change-Id: I7488cdd64cc1e9e887b9904c59e189462c3da5dd