Merge "Fix nit in LocaleDataTest#testInvalidLocale and StringTest#testFormat_invalidLocale"
am: e8caa48d34

Change-Id: Ib9d16400470f531f529ee718ed802a995b37a9fc