Merge "Fix pm create-user when creating user with profile of cur" into tm-dev am: 0791182e

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



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