am 1613f475: am 0f1613c8: Merge "media: Refactor and improve robustness of AdaptivePlaybackTest" into klp-dev

* commit '1613f475b0ba4aad446ed0853e2654d3a98e6509':
  media: Refactor and improve robustness of AdaptivePlaybackTest