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

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

Change-Id: I0df31737b979e656d2364a406ed1f41c792c877c