Merge "Merge "aaudio: reduce glitching by improving sleep timing" into oc-dr1-dev am: d937a5cf85 am: f17f490519" into oc-mr1-dev-plus-aosp