Merge "Add bluetooth folder type to MediaDescriptionCompat and MediaMetadataCompat"