Merge "Grant CAPTURE_AUDIO_OUTPUT permission for trusted process" into tm-dev...

Merge "Grant CAPTURE_AUDIO_OUTPUT permission for trusted process" into tm-dev am: d2a02887 am: 09786d47

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



Change-Id: Id926e6f6018f08ed7a1dcbca72b24d3405f58a4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>