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

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

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