Merge "bump.py: modify the phony system_compatibility_matrix.xml module" into main am: 36470a4400 am: 1f2f4cd2e3

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

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