Merge "MediaSessionCompat: Update javadoc of playFromUri()" into mnc-ub-dev