Bug: 301380610 Bug: 313604701 Test: atest LocalePickerActivityTest Change-Id: Icab8eeea62c7c40c160d745afd08f71fcca5ec9c