Merge "Revert "Remove Q matrices"" into main am: 2908f7ba6a am: c50db2ee51

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

Change-Id: I080cca4b022b492e8522ab3761170044462d18eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>