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

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

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