am 4d66799f: Merge "Fix CTS failure on testPlaybackHeadPositionAfterFlushAndPlay" into klp-dev

* commit '4d66799fc789feb197a590a04e58c0c51fe69868':
  Fix CTS failure on testPlaybackHeadPositionAfterFlushAndPlay