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

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

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