Revert "Revert^2 "Do not cache default app icons when returned f..."

Revert submission 29570743-fix-default-app-icons

Reason for revert: possible culprit of b/371183869

Reverted changes: /q/submissionid:29570743-fix-default-app-icons

Change-Id: Ie3842b060914dadf5560b7d0a0fc7f5dc5152d5b
3 files changed