Merge "Ensure MediaDescriptionCompat retains Media URI on API 21-22" into mnc-ub-dev