Merge "[Bouncer] fix user switch race condition" into tm-dev am: 60f8672e...

Merge "[Bouncer] fix user switch race condition" into tm-dev am: 60f8672e am: c0532af1 am: e8359c64

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



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