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: 9b3bd66d

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

Change-Id: I7499de35a48b63c3b9944362353953e5b1ab1930