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

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

Change-Id: I03511003b38fb8d18e91370b9cddb8eb1a469afe