Merge "Freeze compat matrix 7 for Android T" into tm-dev am: af5938df am: 3d91a640 am: 94183459

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



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