Merge changes from topic...

Merge changes from topic "revert-2652627-vintf_compatibility_matrix_core_hals-DWOQPAPLXM" into main am: 15d61f73 am: 29d5bc4a

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



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