Merge "Prevent multiple outstanding permission queries per client" into sc-qpr1-dev am: 373ed012

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

Change-Id: I85e429a3489888acc218527d9f4e7cb7f1d2bc5d