Merge "Fix custom buttons with translated string" into udc-qpr-dev am: 383cc17a

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



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