Merge "Fix music output to speaker" am: fc9e26a3e9 am: af034fc9cb

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1360120

Change-Id: I84066fdea62f4ac3f559ddb7c7b1c37f5880e0fb