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

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

Change-Id: Ifcdbc8f129e1f7463e98a190e0dc1d66b95980e4