Merge "Provide support versions of Activity.set/getMediaController" into mnc-ub-dev