Merge changes from topic "startAudioSource_issues" am: 45da2609b7

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1678048

Change-Id: I1c13ec912645eb807c60370408d4c3f28bae1531