am b67b7ca1: am 4d66799f: Merge "Fix CTS failure on testPlaybackHeadPositionAfterFlushAndPlay" into klp-dev * commit 'b67b7ca1': Fix CTS failure on testPlaybackHeadPositionAfterFlushAndPlay