Merge "Fix incorrect launcher loading." into sc-dev am: 26801f802e

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I64c139d0e4375973fa3238a6922b12fe41689c0a