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

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



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