Merge "Update KeyboardLayoutPickerControllerTest" into udc-dev am: a2375807

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



Change-Id: Ied198e591c3d003dc6a9f763f8268c3f457ef0d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>