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

Change-Id: I63f91487330a7928d5698856e07ffb9681c48d69