cd3231f501
merge from master: "audio service: set dock use on mediaserver restart Restore forced usage of dock audio for media according to current setting when media server restarts." Bug 7485250. Change-Id: Ie67b80ede1ed92d223dd96de83c1beb985dfba06