Merge "[Media Recs] Add titles and subtitles to the expanded layout." into tm-dev am: 22dc6e9e

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



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