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

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



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