am cdd81636: am 29bac774: am 9090d3c3: am 02022b70: Merge "media: fix estimateFrameRatesFor to use correct ratio" into mnc-dev

* commit 'cdd81636e1938e7c9053648a13e6ccebd2ba9d2f':
  media: fix estimateFrameRatesFor to use correct ratio