Merge "Showcase app: Added media row actions to the music fragment am: f797f525ce am: 54905cd10c" into nyc-mr1-dev-plus-aosp