[conflict] Merge "Update user switching processes" into tm-dev am: cfce4992

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



Merged-In: I32699e32fe1dbe94af2abe7e7ade5363a2b6cb55
Merged-In: I02df941d89467fc678c0749f4a2436ad8fee8b7b

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