Merge "Initial workaround for changed platform codename breakage" into...

Merge "Initial workaround for changed platform codename breakage" into sc-v2-dev am: 192cbbbd am: 245ba85f

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

Change-Id: I0889ec02b34b6f8f9efbc1d857bc935324b34340