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

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

Change-Id: If97f6f317aadf6b1d5c407aff780c16281c98762