Merge "Prevent multiple outstanding permission queries per client" into...

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

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

Change-Id: I9a6109a61587c070ed807a4d715292b75acd058e