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

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



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