Merge "Fix custom buttons with translated string" into udc-d1-dev am: 206821ce

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



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