Merge "Set min_sdk_version: "31" on aosp_test_rcsclient" into main