am 88a83d3f: Update getDisplayLabel() API to support new types.

Merge commit '88a83d3f108dcf01443b241439e14eedbd9615f5' into eclair-plus-aosp

* commit '88a83d3f108dcf01443b241439e14eedbd9615f5':
  Update getDisplayLabel() API to support new types.