Merge "Add a new API android.icu.util.LocaleData" am: 9cb0b52011 am: 926407257d
am: 431e690a80  -s ours

Change-Id: I06f93267315c3da2fecd46db2e234b7de52de437