Merge "AudioFlinger: defer restartIfDisabled()" into main