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

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

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



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