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

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

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