Fix abundance of "Custom" labels.

Not sure precisely why this changed, but hopefully this logic is
more robust. Show the geocoded location if there is no name to use
and a location is available.

Removed GEOCODE_AS_LABEL, which wasn't really used anymore.

Bug: 21814339
Change-Id: I1343282ef415647853d7995d900a3f50186ad156