Merge "DO NOT MERGE: Disable current matrix." into tm-dev am: b5bb158d20

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

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