[conflict] Update user switching processes am: b00cff0f

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



Merged-In: I32699e32fe1dbe94af2abe7e7ade5363a2b6cb55
Merged-In: I02df941d89467fc678c0749f4a2436ad8fee8b7b

Bug: 431940452


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