Merge "Fix javadoc related to ACTION_MEDIA_RESOURCE_GRANTED"