Merge "User switcher - Fix adding user as non-system user" into tm-dev am:...

Merge "User switcher - Fix adding user as non-system user" into tm-dev am: e10d88b6 am: a07116a0

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



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