Merge "Add QUERY_AUDIO_STATE permission" am: 6a5c5e23cc

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

Change-Id: Icc1ded5efbb48748073bf79442dd4ce2b5ec1289