Merge "Unhide LocaleList.getAdjustedDefault()" into nyc-dev