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 am: 22ef9146

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

Change-Id: Ie8e482e6f8805b0d42f3ed900bc12f04fca995cf