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

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



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