remove duplicate for content providers, rename Copying/ to Copy/ Change-Id: I4ad8839da1862185caf15b50e0376bb0e380bb21
Change-Id: I755216fe9d2afca87a9adaeb99840142ff34a685