Merge "Move modules in compatibility_matrices/Android.bp" into main am: 3f53c5c185 am: faa5cdbee6

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

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