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

* commit '29bac774ccba0d696857a058f5a1fae7d5c99ba5':
  media: fix estimateFrameRatesFor to use correct ratio