Merge "Bump tethering target sdk version to 31"