Merge "[Language] Do not back to previous page if dialog is displaying." into udc-qpr-dev am: 43bd9db3c6

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

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