Merge "Do not use pool of SimpleIconFactory objects in Chooser/ResolverActivity" into tm-qpr-dev am: cbb45c6814

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

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