Merge "[MultiUser] fix async bouncer user" into tm-dev am: ab9ea4a8 am:...

Merge "[MultiUser] fix async bouncer user" into tm-dev am: ab9ea4a8 am: b00d2b66 am: aeb7b8d5 am: 0f900d1c

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



Change-Id: I6403c83434fed80e43581659b765dee23efbbdac
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>