am 4978c1a5: am 0ddb0143: Merge "Fix 5623252 unlink to death of audio focus client early" into ics-mr1

* commit '4978c1a5b07782d622ca9e3eedd649a5927d226f':
  Fix 5623252 unlink to death of audio focus client early