Merge "[User Switcher] Fix username sync in bouncer." into tm-qpr-dev am: 6a5411f6

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



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