Merge \\"Merge \\\"media: update getAchievableFrameRatesFor javadoc\\\" into nyc-dev am: 8fe82686ef\\" into nyc-mr1-dev am: 5bebba2124
am: 9a07a09df6

Change-Id: I651a0bacdaf0fdf649093552413e2305b76875de