Merge "Revert "Bump aosp contacts to target SDK 31""