Merge "Fix the translation doesn't work" into udc-dev am: 83b5bfc0

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22085791



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