[automerger skipped] Merge changes from topic "audio_source_issues" am: a0969954f6 am: f9e31dbc3c am: 23bf9db934 -s ours

am skip reason: Change-Id Iaf44db2fd9a90dde9ef8160869af73983a5feae4 with SHA-1 51c9ccd1b6 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib500f5b19ff3db0f6f1636fa589fcb0ad43bc756