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

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



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