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

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



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