Merge "SupportLeanbackshowcase: update songs and metadata am: 15f4055a2e am: 322844393e" into nyc-mr1-dev-plus-aosp
am: 6dc5173808

* commit '6dc5173808628b1f62a74eb2994aff5cd9f83e9b':

Change-Id: I1e3e088ec1608af01747ed10ffb4e92ddb5eefb0