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

Change-Id: Id64ea1467ff63370a23b9937ebf3d1d9f7a777aa