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

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

Change-Id: I5320f41e36430dc1783b537a79e35d30b0ecefd8