Merge commit '46c5fdf60be5ba31ed7f31da42afdee639cddf15' * commit '46c5fdf60be5ba31ed7f31da42afdee639cddf15': Fix Issue 2158631: AudioService: volume control sometimes not restored after media server process crash.
Merge commit '46c5fdf60be5ba31ed7f31da42afdee639cddf15' * commit '46c5fdf60be5ba31ed7f31da42afdee639cddf15': Fix Issue 2158631: AudioService: volume control sometimes not restored after media server process crash.