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

* commit '3782ecdfdbb6c0a4ba1e6f3bba43137370da6ff5':

Change-Id: Ifd734c2e3e62c8d44c34d52a7b9d67cf72241829