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

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

Change-Id: I60a17fb458f925a9a782939dfd79133d776570a8