am 69abccc3: Merge "MediaStore.Audio.Media.getContentUriForPath() returns unexpected content"

# By Jan Bjernler
# Via Gerrit Code Review
* commit '69abccc3cdacee354dec8867865a0577a4e14e63':
  MediaStore.Audio.Media.getContentUriForPath() returns unexpected content