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

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

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