Merge "Always use Shortcut Icon in conversation if available" into rvc-dev am: cc193758 am: 4c42f40c am: 8563378f

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

Change-Id: Ia237fa6d121c0fe7656772f2c06cd8d8d36c8835