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

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

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

Change-Id: I26d97a50492d8b24b29db6a105e5793dba280357