Merge "Revert "Convert hardware/interfaces/compatibility_matrices/Andro..."" into main am: 7732e91f50 am: 9a9d0eaac7

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

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