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

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

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