Merge "Revert^2 "Remove Q matrices"" into main am: 7f3b4b2a38 am: 1fc8301983

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

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