Merge changes I4f3792a5,Ice6ee1a9 into main

* changes:
  AudioFlinger: Update Thread class includes
  AudioFlinger: Move sink config statics to the interface