Merge "Simplifying code around multiple translation components" into...

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

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



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