Merge "Add CAPTURE_AUDIO_OUTPUT permission requirement" am: a90348248b

Change-Id: I9ca6fcccd81c7349ee820e92236ce5bda70dd16a