Merge "[Bouncer] Update userswitcher upon reset" into tm-dev am: 7fa9ff82 am: 1748cf64

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



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