Merge "Updating icon loader method calls as per signature change" into tm-qpr-dev am: 1cc345ab

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



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