Merge "Unihiding REFRESH_SUPPORTED and ContentProviderClient#refresh."