Merge "Add compatibility_matrix.current.xml for S" into rvc-dev-plus-aosp