Merge "Freeze compat matrix 7 for Android T" into tm-dev am: af5938dfb8 am: 3d91a64049

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

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