[automerger skipped] Merge "Refactored switchUSer to handle user switch back to the current user" into udc-qpr-dev am: 58e26a5780 am: bfa1a4d9ca -s ours

am skip reason: Merged-In Ia40cfacbee6fc174c90db8e3687838ae01e2858b with SHA-1 46088e4f1a is already in history

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

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