[automerger skipped] [conflict] Update user switching processes am: b00cff0f...

[automerger skipped] [conflict] Update user switching processes am: b00cff0f am: 5a86dfd9 -s ours

am skip reason: Merged-In I02df941d89467fc678c0749f4a2436ad8fee8b7b with SHA-1 2efdc51b is already in history

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



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