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

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

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