Merge "Introduce trimMemory to AppIconCacheManager" am: 10ae330a97

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2308424

Change-Id: I9e4049722b4c341aa57d656ae572d6522de49f65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>