Android 7.1.1 release 60
audio: fix headset + speaker path commit 3112ad5d did not include modifications for combo paths (speaker + headset) causing loss of audio over speaker when playing over both speaker and headset simultaneously. Bug: 32464208 Change-Id: I6525318ceb5a21aba16deb3e7fe30dbb3c0a7908 (cherry picked from commit 161ffb5fef229f331f212c0b76b133f1f2060658)