[conflict] Merge "Rename compatibility_matrix.current.xml" am: 227fecd3 am:...

[conflict] Merge "Rename compatibility_matrix.current.xml" am: 227fecd3 am: 18ace8f8 am: 3b485172

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



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