Merge "Merge "Update the music files icon." into oc-dev am: 47c6afde7f
am: 60287a50e8" into oc-dr1-dev-plus-aosp
am: feaa8fe083
Change-Id: Ifdf5877774b4022a118fa9231aaee1fe6f4a3579
This commit is contained in: