Merge "Remove Q matrices" into main am: 80c14fb148

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

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