[automerger skipped] [conflict] Merge "Update user switching processes" into...

[automerger skipped] [conflict] Merge "Update user switching processes" into tm-dev am: cfce4992 am: 298d4e6f -s ours am: 0e2d0ef1 -s ours

am skip reason: Merged-In I32699e32fe1dbe94af2abe7e7ade5363a2b6cb55 with SHA-1 ab9e7aeb is already in history

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



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