Merge "Revert "Load direct-share icons asynchronously"" into tm-qpr-dev am:...

Merge "Revert "Load direct-share icons asynchronously"" into tm-qpr-dev am: abe2a224 am: 22d7790c

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



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