Merge "Add flag for async bouncer." into tm-qpr-dev am: ccc5a355 am:...

Merge "Add flag for async bouncer." into tm-qpr-dev am: ccc5a355 am: f124983f am: 11d17bba am: 5b5558a6

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



Change-Id: I74e85c4da0c697a5e0336944b9f4258a17b335f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>