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 am: 70891db1

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



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