Merge "Revert "Disable current matrix."" into tm-dev-plus-aosp am: 5ca6f2a3...

Merge "Revert "Disable current matrix."" into tm-dev-plus-aosp am: 5ca6f2a3 am: 6ea689eb am: dc4eb6b6

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



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