Merge "Add more test cases in LocaleManagerOverrideLocaleConfigTest" into udc-dev