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

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

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