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: 3c876df1

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



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