Adjustments based on the changes in ZoneGetter(settingslib)

In settingslib, now the two public functions in ZoneGetter have
the same logic(display the same name based on locale). This cl
is to deal with changes in Settingslib.

Bug: 19764807
Test: ag/1490275
Change-Id: I3e1c0bface752dc2ef4653ff58c4639c262964c1