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

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

Change-Id: I62a03be182ec178c6221d4b34c718f1c002d4fe2