Merge changes from topic "audio_source_issues" am: a0969954f6

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4ab09220648b22b7b615948ca33cc107e173b302