Merge "aaudio: fix intermittent hang and position error" into oc-dr1-dev am: c1fe2634dc
am: 2dd56c9e2c

Change-Id: I2324f99835d005d46cc2838888c3cc65e66730a1