Merge "Always use Shortcut Icon in conversation if available" into rvc-dev am: cc1937581a

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

Change-Id: I150bd3a1810a5cc922313dd0958058338e70a721