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

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

Change-Id: I6296d6dd227058a728f9a4718b198bba9756e019