Merge "aaudio: minor cleanup in clock model" into rvc-dev am: ef0ade40f3 am: b86c9af112 am: 4c3c226785 am: fd04cc4b8a

Change-Id: I62970c58a321bae11c8d938b1db2c9799a621000