Merge "Freeze compat matrix 7 for Android T" into tm-dev am: af5938df am: 80dbd9e0

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



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