Merge "Changed ServiceInfo.Locale to a List"
am: 9337ab17bf

Change-Id: I94079cbb405843e1339e5e592c60fe4e199c6584