Merge "audio flinger: match app op monitoring to audio source" into sc-dev am:...

Merge "audio flinger: match app op monitoring to audio source" into sc-dev am: 28ba8f44 am: d8625e32

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

Change-Id: I430dc36912e25d28f27b2f0c39a5e9f0fb99c033