Merge "AudioService: do not unmute media on headset plug in total silence mode" into oc-mr1-dev
am: 0f6e9b5a79

Change-Id: I2594a1abb5f3deb66ab26b8b6d277a589ffecf4a