Merge "Add QUERY_AUDIO_STATE permission" am: 6a5c5e23cc am: 4909c80b29 am: 2bc3c1daff

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

Change-Id: I52b508e1ea906875f2933c3cc0bcfeede3b1e603