Merge "AudioService: do not unmute media on headset plug in total silence...
Merge "AudioService: do not unmute media on headset plug in total silence mode" into oc-mr1-dev am: 0f6e9b5a
am: ff9a8214
Change-Id: If21221f4345adaebba2e3c23d641a12d9d1fda67