Fix 2 bugs involving split staging task translation am: 978b0021a9

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

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