Merge "[Refional Preference] Fix test case fail" into udc-qpr-dev am: 073b6fae

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



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