am 0ac53364: Merge "Fix non-monotonic AudioTrack::getTimestamp after pause" into lmp-preview-dev

* commit '0ac53364b79dc72ee0c09f0efc46a22ab4374dbf':
  Fix non-monotonic AudioTrack::getTimestamp after pause