Merge "MediaDescriptionCompat: add mMediaUri to the parcel" into mnc-ub-dev