Merge "Introduce trimMemory to AppIconCacheManager" am: 10ae330a97 am: f5dd957cf6 am: bc893cb86d

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

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