Merge "Removing is_static parameter from MediaProviderWrapper CacheMethod"