Merge "Introduce trimMemory to AppIconCacheManager"