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

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

Change-Id: I75ef9afab15e8d22e8f45fa8b04094047706d414