Merge changes from topic "revert-2652627-vintf_compatibility_matrix_core_hals-DWOQPAPLXM" into main am: 15d61f73d2 am: 29d5bc4a76 am: 52988253ef

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

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