Merge "Add i18n to "module_current"" am: 0a9079431b am: f8d4f6e5c9 am: ea6bdcee81

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

Change-Id: I3044ab4f57acde0adf73b8d7c7a1da5e92995898