Merge \"media: update getAchievableFrameRatesFor javadoc\" into nyc-dev
am: 8fe82686ef

Change-Id: I7eac5a104c11d6176d0b8c5469e9a35b36e5cdc4