Merge "AudioTrack: Limit timestamp time lag after start" into oc-mr1-dev am: cea54cf940
am: 0fbd5badd5

Change-Id: I910d96c6901bad81987191ea2485435a6fcf8a7f