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

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

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