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: I0980b6db5ca338c08d2924c88cab13321bef1b9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>