Merge "Remove unnecessary offset from the app label ICU string" into tm-dev am: f89d83f4e0 am: 076a0b1ec1

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

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