Merge "aaudio: minor cleanup in clock model" into rvc-dev am: ef0ade40f3 am: f616b48b74 am: 17de60e275 am: 93c56f830f

Change-Id: Ib2b019aadd3bdca783c55ac3a57ddc8c601ffb30