Merge "Fix Launcher3 issues due to hardcoded default user" into udc-qpr-dev am: fbb34d205a

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23765918

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