Merge "[Bouncer] fix user switch race condition" into tm-dev am: 60f8672e am: 60f348e5 am: 899c1693 am: 48b9e703

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



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