[automerger skipped] Introduce a CustomIconCache for editing favorites am: 95e63154f8 am: 8f6c338fd6 -s ours

am skip reason: Change-Id I8ac2e1ee983ad8ab714f050edaa8981a2307beca with SHA-1 8f659543fa is in history

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

Change-Id: Ib515c85d086a7ccacaa48abab528854794f067b9