Merge "Add i18n team to localepicker OWNER" am: 21eebdce59 am: 7ccb003e9a am: 2054adddf7 am: 31ae1b4623

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2033623

Change-Id: I53bb510a7a4f06a9567a7a8ef206aad5abb9afc8