Make sure we handle the matrix separately for non-invertable matrix

b/36895991
Test: added CTS tests and Run spotify

Change-Id: I2786e612494530405dad5c3edb2bc53915a1c2dc
1 file changed