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

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

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



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