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

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



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