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

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

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