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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0a35a3ee2987ea80cff0c445c7b0d97f64420e6f