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: Ia9f06fd0025044cc1136f00d76891b7fa81272a6