Merge "MediaSession: Update javadoc of prepare-related methods" into nyc-dev