Merge "media: update getAchievableFrameRatesFor javadoc" into nyc-dev