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

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



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