Merge "music: Remove deprecated MODE_WORLD_READABLE and MODE_WORLD_WRITEABLE" am: 3d199bc40a am: 52d3114a77
am: bf3353fed5

* commit 'bf3353fed525e4d56c8d86b44808b682330b6aa0':
  music: Remove deprecated MODE_WORLD_READABLE and MODE_WORLD_WRITEABLE

Change-Id: Ic60a48d109e13f217c1403fdcb3a3e27768d6f4f