[automerger skipped] Merge "Revert "Disable current matrix."" into...

[automerger skipped] Merge "Revert "Disable current matrix."" into sc-dev-plus-aosp am: 0f7d4e62 am: bfc66112 -s ours

am skip reason: Merged-In I4525301ad1205cf41937a98b7b9f67f052cb5bd9 with SHA-1 fb557024 is already in history

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

Change-Id: I0f0c05cece231a75ad9546356583f70c1891838c