Merge "Add 31.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS" into sc-v2-dev