Merge "Adds icon support to fake quick affordance client." into tm-qpr-dev am: b28a5b99

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



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