Merge "Android Patch: Workaround U_MISSING_RESOURCE_ERROR regression with invalid locale"