Merge "Add Smartspace media card in media carousel when the Ss data is...

Merge "Add Smartspace media card in media carousel when the Ss data is available." into sc-dev am: d8a78dcb

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

Change-Id: I3a437ec4e2151d6e3bbc9b16cdf5816e640e388a