Merge changes I0748a827,Id044bfc5 into main

* changes:
  AudioSystem: Move AudioFlinger fetch to ServiceHandler
  AudioSystem: Modernize containers