Merge "aaudio: minor cleanup in clock model" into rvc-dev am: ef0ade40f3 am: b86c9af112 am: 54e3158ac6 am: b7b9129c87 am: c1e0bb8925

Change-Id: If2f0104642c7f7d24ceb720bee93027cef45b61c