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