Merge "Add bluetooth folder type information to MediaDescription and MediaMetadata"