Merge "Simplifying code around multiple translation components" into tm-qpr-dev am: 33c3e774

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



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